From f2626b61835c4d556ecce260b41f1438c4cd33c3 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Jul 2011 18:14:00 +0200 Subject: [PATCH] menubar: Use gtk_widget_class_set_accessible_role() --- gtk/a11y/gtkmenushellaccessible.c | 5 +---- gtk/gtkmenubar.c | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk/a11y/gtkmenushellaccessible.c b/gtk/a11y/gtkmenushellaccessible.c index 5cdf71ebdd..3bebe79650 100644 --- a/gtk/a11y/gtkmenushellaccessible.c +++ b/gtk/a11y/gtkmenushellaccessible.c @@ -34,10 +34,7 @@ gtk_menu_shell_accessible_initialize (AtkObject *accessible, { ATK_OBJECT_CLASS (_gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); - if (GTK_IS_MENU_BAR (data)) - accessible->role = ATK_ROLE_MENU_BAR; - else - accessible->role = ATK_ROLE_UNKNOWN; + accessible->role = ATK_ROLE_UNKNOWN; } static void diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index c54bc79244..428cf51fb7 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -130,6 +130,8 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) widget_class->draw = gtk_menu_bar_draw; widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR); + menu_shell_class->submenu_placement = GTK_TOP_BOTTOM; menu_shell_class->get_popup_delay = gtk_menu_bar_get_popup_delay; menu_shell_class->move_current = gtk_menu_bar_move_current; -- 2.30.2